r850: Merge 2.1: