Merge branch 'develop' into 'iss-149/profile-fields-setting'

# Conflicts:
#   src/components/settings_modal/tabs/profile_tab.vue
3 jobs for iss-149/profile-fields-setting in 8 minutes and 58 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Lint
passed #129789
lint

00:02:19

 
  Build
passed #129790
build

00:03:08

 
  Test
passed #129791
test

00:03:30