merge latest rb-helper