Manual merge from dev_pasdk_pp_work1, commitId=cf72f3b