KFSCNTRB-594 changes per code review