Merge branch 'nd/conditional-config-in-early-config'