This is the tracker bug for all the different types.
pushed to 2.5 w/ change to upstream CDT container strategy
This approach has been delayed. Restructure when appropriate.