Merge branch 'tg/next__media_port_spiegel.lua' into next