Fix keys for slots b and c
Merge remote-tracking branch 'origin/dfp-refactor' into db-sharding