Revert to 9699974
List table changes to group connectors with contexts