Allow base64 Strings for metadata upload
Comment updated
Merge remote-tracking branch 'upstream/master'

Sync with Upstream master
Merge branch 'frankzimper-master'