report maps bug fixed
Merge branch 'dev' into production