BATCH-1949: Updated for autoproxy check