Bug fixes for previous patch.
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  Bug fixes for previous patch.