bug fixes on poma-6451
Loan Repayment
Merge remote-tracking branch 'origin/develop' into POMA-6769
Merge branch 'develop' into uat