Merge "Add support for rsp inputs" into main