Merge branch 'cycles-frontend-static' into 'develop'