Merge branch 'nil-report-object-hotfix' into 'develop'