[MERGE] forward port of branch 8.0 up to 83a4a58
[MERGE] forward port of branch 8.0 up to 83a4a58

JayVora-SerpentCS/website,khaeusler/website,JayVora-SerpentCS/website,Tecnativa/website,Tecnativa/website,nicolas-petit/website,nicolas-petit/website,khaeusler/website,RoelAdriaans-B-informed/website,JayVora-SerpentCS/website,RoelAdriaans-B-informed/website,Tecnativa/website,RoelAdriaans-B-informed/website,RoelAdriaans-B-informed/website,khaeusler/website,nicolas-petit/website