Issue #2245239 and Issue #2129415 - laying groundwork to allow other modules to add custom reports and checks.