Merge "Synchronize on subscription list." into nyc-dev