Merge "YAML fixes"