Config sync from experimental branch