Merge remote-tracking branch 'jaimeMF/vevo_fix'