KCINFR-979 : Code review changes