Merge branch 'hotfix/2.2.6'
Corrected mistake of deleting functions on poc/reports
deleted functions from nacp/reports (correctly)
Merge branch 'feature/reports' into hotfix/2.2.7
Merge branch 'hotfix/2.2.7' into develop