Merge pull request #13577 from BKPepe/click