Merge branch 'master' into Eran
report - is filter active
Merge branch 'Eran'
Merge branch 'master' into Adar