effort based efficiency & current intermediate fix
Merge remote-tracking branch 'origin/staging' into report_refactoring