Merge pull request #12928 from seamuslee001/dev_financial_33