New Upstream Snapshot - hotpatch

No successful merges for hotpatch