Merge heads (issue #25926).