[MERGE] forward port of branch 9.0 up to 24eee9d
[MERGE] forward port of branch 9.0 up to 24eee9d

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