Don't know (yet) why this is needed, I just know that it is!
Merge branch 'refactor_control_panel_context' into open_access_control_panel