Merge "dashboard update for 8/1" into jb-dev