Merge pull request #5886 from neilLasrado/develop

[Fix] Fixed issues in Fee records