Merge from vendor branch HEIMDAL: