The client is not the source of truth#7438

jamadeo merged 2 commits intomainaaif-goose/goose:mainfrom

dont-override-the-clientaaif-goose/goose:dont-override-the-clientCopy head branch name to clipboard