Merge branch 'tg/next__fix_media/publicsenat' into next