Upstream advanced (19/43)

Upstream advanced