Intregrate Nadav commits in CR new branch