KFSCNTRB-846 initial changes after code review