KCINFR-979: bad rebase merge