Merge branch '2653_input_password_fix'