Update to 4.6

-contains specific updates needed for input mapping to work in 4.6