rebase of v2.0001-dashboard