BUG-7033: Follow-up to address prior comments