This is second REL1_2_STABLE commit which is successful in the binary build.
I commit this to make smaller step visible to public.

After this, I will continue regression test fix toward release 1.2.