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

* commit '5105c185274bf09edaba8ce0bd5d8c1d3c203152':
  Optimizing: Clean up after HRor.