SM-13386 YAML Fixes