Merge "Optimizing: Clean up after HRor."
am: 70c1a8fade

* commit '70c1a8fade2967453663d0ffed0f137f06555fff':
  Optimizing: Clean up after HRor.