Reconciling further changes from previous merge