Moved logic out of classes to DBUtils awaiting refactor
Merge remote-tracking branch 'origin/db_refactor' into core_refactor2
Last deprecation in ConfigOption removed