Upstream advanced (10/43)

Upstream advanced