Merge from vendor branch GROFF: