Merge branch 'jk/maint-null-in-trees' into maint-1.7.11