Merge branch 'jc/merge-dash-previous' into next