[MERGE] forward port of branch 9.0 up to 28e2dcf
[MERGE] forward port of branch 9.0 up to 28e2dcf

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