Merge branch 'upstream-sep2019-tcombo' into subtree