Merge parseMediaLink fix from 3.0