Merge branch 'cycles-gun' into 'develop'