SYS-796: included review comments
check lite