Merge branch 'jm/mem-pool'