Merge branch 'tee_for_v7.1' into next