Merge remote-tracking branch 'upstream/next' into next
Merge remote-tracking branch 'upstream/account_transfer' into next
avoids throwing when not required
Merge pull request #83 from mmoadeli/MAID-BUG-FIX7

Maid bug fix7