Merge branch 'release/1.2'
Problem with utils migration in production.

I need to set up a staging site so this stops happening.
Merge branch 'hotfix/1.2.1' into develop