Merge + inputmanager changes