Merge branch 'fix/report-controller-test' into 'develop'