manual update from upstream: