Merge "add rsp option"