factorize call
Merge pull request #17691 from makinacorpus/7

factorize call