Merge branch 'cycles-router-api-routes' into 'develop'