r10656: BIG merge from trunk. Features not copied over