Merged Data::Core from branch db-store