put this at the root
Merge branch 'adapt-kbd' into legacy