Merge commit 'ca35f780ac4654bfa086613c72b011448afff327' into upstream-merge