Code

Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1