GCP-6982 integrate with save listener