null beneficiary fix
Merge origin/master