Just noting: merge conflict area with #958.