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

Kristiaan Van den Eynde (107433c9) at 01 Jul 09:11

Cherry-pick from 4 but drop the changes re hook and access policy u...