Merge remote-tracking branch 'origin/patch'

Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/disassembler/AutoTableDisassemblerTest.java

@@ -595,6 +595,7 @@ public class AutoTableDisassemblerTest extends AbstractGhidraHeadedIntegrationTe
 		JButton button = getActionButton("Make Selection");
 		assertNotNull(button);
 		pressButton(button);
+		waitForSwing();
 
 		CodeBrowserPlugin cbPlugin = getPlugin(tool, CodeBrowserPlugin.class);
 		ProgramSelection currentSelection = cbPlugin.getCurrentSelection();

Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/matchtable/VTMatchTableProvider.java

@@ -146,6 +146,8 @@ public class VTMatchTableProvider extends ComponentProviderAdapter
 		updateFilterDisplay();
 
 		setTableSelecionState(saveState);
+
+		refilter();
 	}
 
 	private void setTableSelecionState(SaveState saveState) {
@@ -232,7 +234,7 @@ public class VTMatchTableProvider extends ComponentProviderAdapter
 			if (matchesTable == null) {
 				return; // we've been disposed
 			}
-			
+
 			int filteredCount = matchesTableModel.getRowCount();
 			int unfilteredCount = matchesTableModel.getUnfilteredRowCount();
 

Ghidra/Processors/ARM/data/manuals/ARM.idx

@@ -20,6 +20,7 @@ blx,	7198
 bx,	7200
 bxj,	7202
 cbnz,	7203
+cbz,	7203
 clrex,	7204
 clz,	7205
 cmn,	7212