Merge branch 'fix/migration-alter-citext-field-with-key' into 'develop'