- GCP-8423
- Refactor the saving to remove the duplicate code.