Merge branch 'ht/mem-debug' into ht/graphs