Merge branch 'master' into Eran
delete ranges
Merge branch 'Eran'