Release version
Merge branch 'marketing-1.0' into develop