Merge branch 'master' into Adar
reports: fix error
Merge branch 'Adar'