C0103 fixes 4, datastore and db_store changes

dependent PR