New feature squash
Merge branch 'new-feature' of github.com:beercorp/test into new-feature