Media is now core, two fields rely on it.
3.3.1.2
Signed-off-by:KProvance <kevin.provance@gmail.com>