Merge commit '1d914fa0af66024faee8cc6fa3043a935f95f775' into upstream-merge