Merge branch 'gizmos-v1-upstream-x-y-lines-v1.7' into gizmos-v1

Merge branch 'gizmos-v1-upstream-x-y-lines-v1.7' into gizmos-v1 #270