Tweaks to LWI stats changes
Merge branch 'lwi' into stats_api_v1