fix SWW on pm_dashboard in connection with @bill
Merge branch 'dev' into dev_mirror