Merge changes to add v11 backward compatibility.