This is a combination of 2 commits.

Addressing review comments for Loan-Accounting bridge