Merge commit 'a62acdc0cc5308706e2503557a09828979b59a12' into upstream-merge