Merge branch 'dl/subtree-avoid-tricky-echo' into next