qa/569 - resolve conflict from last merge
qa/569 - resolve conflict from last merge

adfernandes/pcp,wuliming/pcp,wuliming/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,wuliming/pcp,wuliming/pcp,wuliming/pcp,adfernandes/pcp,adfernandes/pcp,wuliming/pcp,adfernandes/pcp,wuliming/pcp,wuliming/pcp,adfernandes/pcp