[B-78574] Fixed merge issues from previous merge