Patch Set 1: Looks good to me, but someone else must approve; IP review completed

Yep, much more reliable for me now. Some sync tests are still red but I think this has to do with the usage of different repository instances.