Test cherry pick and CLI YAML parse fix