Cherry pick from 705ae1d971: *BRANCH* More dashboard refactoring