Merge "StatsManager throws exceptions" into pi-dev