Merge branch 'feat/format-optional-migrations' into 'develop'