I would prefer to have two pull requests, each for the two different features. In this way one or the other can be merged separately.
For example, the db_load addition may need to be adjusted to detect conflicts with db_mode, because db_mode=4 is supposed to only load from db.