Submitted by: Ports Fenner
and input class. PR: 23614 Submitted by: Ying-Chieh Liao <ijliao@csie.nctu.edu.tw>