Prevent "mass-assign protected attar" errors while migrating.
Merge branch 'master' into staging

* master:
  Prevent "mass-assign protected attar" errors while migrating.
Merge branch 'staging' into production

[#55644358]

 the commit.