Upstream merge 5c14701..bdd1a73