Merge pull request #18324 from mattwire/payproc_configoptional