DDBEASY 204 - Upgrades media module.
Merge branch 'DDBEASY-204' into development