Merge "Fix testPssh. *** DO NOT MERGE ***" into oc-dev