v1.0.2
9e3606bd · Merge pull request #16386 from benesch/cherrypick_16370 ·