Decode uri in image element
Merge branch 'develop'