Merge pull request #18517 from JMAConsulting/financial-issue-150