BATCH-2003: Updated per code review comments