BATCH-2089: Updated per code review