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