[MERGE] forward port of branch 9.0 up to 4c07faf
[MERGE] forward port of branch 9.0 up to 4c07faf

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