Fix issue with configs that are compiled
Merge remote-tracking branch 'upstream/extDB_beta' into extDB_beta