#2435: merged r12818 from trunk to stable (which was a reverse merge of r12796, only merge info is affected)