BATCH-2072: Updated per code review