Merge "Fix media on W/T"