Fixed the build
Merge branch 'release' into dev