Merge branch 'master' into Eran
ee_count + pass_count in report
Merge branch 'Eran'