Feature/gcr