am 2b562f40: Merge "Some heap cleanup"

* commit '2b562f400cf9717f197ae3ae1f9a32c96769ef06':
  Some heap cleanup