KFSCNTRB-846 more changes after code review