bug fixes on success message (GCP-8521)