Issue #2224767 by katbailey: Add support for per Option Set reports/stats