merge with dashboard-module