Finished scap sync-world: Backport for [[gerrit:1240685|Squashed diff to master]] (duration: 06m 43s)