Merge branch 'hotfix/3.5.0.1'
Changed the GetSourceUri method to be more safe and return an empty string incase the media item is null
Merge branch 'hotfix/get-media-url' into develop