Merge "Revert "Consolidate flags in Transaction"" into main