Merge branch 'charon-conf-fallback'