Merge pull request #1071 from keymanapp/mac-1059-cherry-pick-from-stable-10.0-do-not-call-unsupported-selectors [Mac] #1059 cherry pick from stable 10.0 (do not call unsupported selectors)