New Upstream Snapshot - weresync

No successful merges for weresync