Merged dashboard-test panel fix