backport request_path fixes