Merge branch 'fix-start-with-broken-config' into next