SM-13386 YAML fixes