DAR-2593: Address code review remarks