New Upstream Snapshot - nbc

No successful merges for nbc