Merge change 24577 into eclair

* changes:
  Update peephole optimizer