needs to have the diagnostic list explained, and the media support list filled out before it gets pulled up to the 1.4 branch. However, it's here to answer PR#6870