Merge pull request
#12004 from meeseeksmachine/auto-backport-of-pr-12003-on-7.10.x...
Merge pull request
#12004 from meeseeksmachine/auto-backport-of-pr-12003-on-7.10.x
Backport PR
#12003 on branch 7.10.x (bugfix for 7.10.1: revert inputhook param location)