KFSCNTRB-1681: code review changes