Cherry pick input wrapper
Cherry pick input wrapper fix