r3154 - maintenance->trunk sync of changsets 3147~3152