Merge pull request #19152 from MegaphoneJon/financial-160