Fixes lack of currency for account payment
Merge remote-tracking branch 'dzikakis/Issue-1920' into develop
Updated Version 3.1.12.017