Merge branch remove-compatibility.