merged latest rb-helper