Upstream advanced (18/43)

Upstream advanced