Merge change 25180 into eclair

* changes:
  Prevent unstateful edits, empty trimming, INSERT edge cases.