Merge branch 'fix/grow_heap' into develop

* fix/grow_heap:
  Fixes redundant cast and header style in Baker MM