r862: Merge 2.1: