Upstream merge bdd1a73..ede7dad