match question and hints, fix #53590
Merge pull request #61745 from mauk81/patch-1

match question and hints, fix #53590