Merge branch 'tee_for_v6_16' into next