Merge branch 'tg/maint__fix_website/publicsenat' into maint-0.4