modify media field handling (#14045 & #14048)