KCINFR-979: code review changes.