Change to editorial as fk.
Merge branch 'migrate-to-editorial-fk' into develop
Merge branch 'develop'