[PPP-3147] Performance enhancements