This makes it easier to implement batch overriding for the components. (cherry picked from commit cca01407a7)
cca01407a7