New Upstream Snapshot - dose3

No successful merges for dose3