merge with latest rb helper