GCP-7208 plus removed commented codes