Merge branch 'cycles-guard' into 'develop'