Merge "Add missing flag to transaction merge"