Merge pull request #11907 from mattwire/contribution_financialtype_fix