Fix conflicts for #3816