pull request for compatibility with `devconfig`

Please pull into the develop branch