Replace secrets with join tokens Upstream-commit: f5e1f6f6880391a5a3399023cf93a3c48502e57d Component: engine