KCINFR-979: making s2s error messages end user maintainable