Land latest changes to v2020

Frederic Danis requested to merge attic/pkg/apertis-customizations:wip/fdanis/6233 into apertis/v2020 Feb 04, 2020