Merge branch 'cn/config-missing-path' into next