Fixed: Bugs reported by scrutinizer
Fixed: Solve conflict between ->iban and ->iban_prefix.
Merge remote-tracking branch 'origin/3.7' into develop