Merge branch 'jc/squash'