missing defice types (Bug 38406)
Merge branch 'release-3.0.0' into release-3.3.0
orderBy in genres (Bug 36329)
Merge branch 'release-3.4.0'

Conflicts:
	eda/iptv.rst
	eda/streaming.rst