CLDCONNECT-1169: Fix
CLDCONNECT-1171: Adding compatibility with batch module
CLDCONNECT-1172: Fixing confused deputy vulnerability