this needs !32304 (merged) to go in first
This is part of DerivationFramework merging effort. The agreement in Software Coordination was that the review could be expedited.
cc @jcatmore