#2435: merged r12790,r12791,r12792,r12796,r12798,r12801, and r12817 (reverse merge of all previous) from trunk to stable. (only merge info is affected)