Merge with harp-orm/core