Merge branch 'jc/maint-1.6.0-read-tree-overlay' into maint