Finished scap sync-world: Backport for [[gerrit:1242568|Squashed diff to master]] (duration: 07m 23s)