Merge branch 'cycles-router' into 'develop'