FINCN-164 Implement changes suggested by https://github.com/apache/fineract-cn-fims...