PT-501: cherry pick changes for httpd