Merge branch 'nd/conditional-config-include'