Align auto coproduct support with master