Issue #22133:performance tweaks