[ZH/MPS][000000] Yaml concat improvments