Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev