Merge from vendor branch MALINEN: