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