Merge "Revert "Add pre-deprecated "after-merge-finish" transaction"" into main