Merge branch 'chore/format-migrations' into 'develop'