Merge "Clean up bundleClientTransactionFlag (1/n)" into main