rebased newdashboard branch forward on v1.70