Merge "Accommodate limitations of CTS web server" into oc-dev