Better support for dual plans
[Finishes #78141960]