Merge "Fix P120905-5631" into 2.0_beta