Kristiaan Van den Eynde pushed to project branch 3533155-backport-2 at Issue forks / group-3533155

Kristiaan Van den Eynde (6946b78a) at 01 Jul 12:14

Cherry-pick from 3 with machine name changes