Recipient Bundle - improvements
Merge branch 'dev'