Fix Issue 8101 - Fixup pull improving diagnostics when there are overloads.
Merge pull request #3520 from AndrejMitrovic/Fixup8101

Issue 8101 - Fixup pull improving diagnostics when there are overloads present.