Merge branch 'upstream-sep2019-sfix' into subtree