Pull in fixes from remote. Update to use dbProvider.