For update of traits list during certain saving conditions

GCP-9595

Post commit code review : Daniel Jao