KFSCNTRB-846 changes after code review on 6/4/2014