Merge branch 'squash-test'