Fix CustomReports
Merge Develop to Master
Fix merge mistake