merge revision 25264 to release-1.12
merge revision 25266 to release-1.12
Updated version to 1.12.2