Merge "Merge upstream 0.165 SHA '203f0a3'"