Cherry-picked files from req-PUB1