Merge from upstream @ commit 5baad1d554b189330ae0302139e7c07dfdc3a0b6