Merge branch 'lp/maint-diff-three-dash-with-graph'