KCINFR-979, KRACOEUS-6954: fixing bad interactive rebase