merge with trunk @ 139506