Add missing changes from previous merge commit