KCINFR-979: responding to code review comments