Upstream merge

Currently running OK on dev instance.