Fix building before release
Merge branch 'v3'