Trying to fix velocity shim
Merge branch 'bellows-2.0' of https://github.com/mobify/bellows into bellows-2.0