Do you consider such change as a part of this PR? I suppose it is much more global change, which should be handled separately