Finished scap sync-world: Backport for [[gerrit:1288504|Squashed diff to master]] (duration: 20m 05s)