Merge commit 'afc42f9336add2d5bc7d8c6504eac6e9ab362b02' into upstream