Merge pull request #18977 from Rightpoint:objc-collision-fix
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 2 Dec 2020 19:06:57 +0000 (19:06 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 2 Dec 2020 19:06:57 +0000 (19:06 +0000)

Trivial merge