Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maint