New Upstream Snapshot - solid

No successful merges for solid