Merge branch 'rs/simplify-config-include'