Add changes from branch 'donor-ios'