KCINFR-996: code review comments