Enable  media message forwarding
Merge remote-tracking branch 'origin/ff_av' into ff_av123