as well as implement all review feedback provided on the original PR see https://github.com/apache/fineract/pull/629 for background also https://jira.apache.org/jira/browse/FINERACT-733
as well as implement all review feedback provided on the original PR see https://github.com/apache/fineract/pull/629 for background also https://jira.apache.org/jira/browse/FINERACT-733