IDEX-706; IDEX-811: make media-type parameter optional
IDEX-706; IDEX-811: merge with master
IDEX-811; IDEX-706: merge with master
Merge branch 'master' into new_tree
IDEX-811; IDEX-706: merge with master
Merge branch 'master' into new_tree
Merge branch 'new_tree'