Merge branch 'cycles-side-effects' into 'develop'