Merge branch 'rs/fast-import-simplify-mempool-allocation'