Merge "Adjustments for new media pipeline" into main