Better support for dual plans
[Finishes #78141960]
Merge pull request #41 from Nurego/michael-dev

Better support for dual plans