Merge branch 'release/2.1.0'
Fix for payment plan monthly cost presentation.
Merge branch 'hotfix/2.1.1' into develop