Merge branch 'feature/db-metadata-configurable' into silex-exp