Prevent overwriting of real buyer information.
Merge branch 'master' into staging