GCL1-12488
Address save updates