update for new rbp patches
Merge pull request #361 from gtmanfred/master

update for new rbp patches