KFSCNTRB-2129 merging into git
KFSCNTRB-2131 merging into git