2.9 compatibility changes for recent master commits