Merge branch 'Adar'
Merge branch 'master' into Eran
report empty functions
Merge branch 'Eran'
Merge branch 'master' into Adar