Upstream advanced (41/43)

Upstream advanced