This work is related to overall performance issues within UPS with respect to metrics which is important for us to land around 3.17.0 timeframe. Massimiliano Ziccardi I would suggest to focus our efforts on AGPUSH-2072 and loop back to this ticket for 3.17.0 as the other ticket is the highest priority right now around UPS.