Prep work for GCP-8521