rinse: re-sync with pullrequest/2358