Upstream pre intermediate b1 (21/48)

Upstream pre intermediate b1