Merge branch 'jn/parse-config-slot'