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