Cherry picked global input class commit
Cherry picked commit for input_class on input