This Pr is piece of #35534, in order to lead the way for some more optimization
Closes #35199 (closed)