Merge branch 'fix/update-reports-old-format' into 'develop'