qa/098: more diagnostics to help debugging
qa/098: more diagnostics to help debugging

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