Merge branch 'Adar'
Fix Import Bugs
Merge branch 'Eran'
Merge branch 'master' into Adar