upstream update & attempt at fixing ctrl-r