Bringing v1.64-dashboard-tests up to date with latest changes from v1.64