Merge branch 'tg/next__add_support__media/majestyc.lua' into next