Merge branch 'master' into Adar
reports: fill table
Merge branch 'Adar'