Merge "P120829-5684" into 2.0_beta