Merge "Move altered input handlers to pip2 [1/N]" into main