Merge "Protect sp assignments in RemoteDataSource." into oc-dev