This fixes #7410.  This is the control input driver.  It is for all arches.
Work on bug #7410.
Merge branch '0.10.1'