Merge "Reapply "Apply pending transactions always"" into main