Merge branch 'tg/next__media_port_bikeradar.lua' into next