SM-8158 YAML fix