[deliver #1234] rp branch addition
Merge branch 'rp' into develop