Conflict fixes of #2857