Starting work on 1.15.9: keyboard cleanup in progress