Merged r12277 (#15344).

--HG--
branch : 2.3-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.3-stable%4012279