Base commit for the 1.11 branch