LRDCOM-12160 Minimize payload for better performance