bundle commits for test control panel improvements