Merge "Avoiding implicit transactions when applying"