ref: refs/heads/9206-bugfix-prod-pipeline
