Merge branch '736-dev-fix-upload-sending-nothing-as-lang' into 'dev'

Resolve "Upload file sends 'Nothing' as language which results in 400 error from backend"

See merge request !509