Added fix for saving of parents    Ticket: GCP-9127 GCP-9128   Reviewer: Jai