Merge branch 'develop' into 'feat/client_add_fields_xls'

# Conflicts:
#   test/application_system_test_case.rb
2 jobs for feat/client_add_fields_xls in 39 minutes and 40 seconds (queued for 27 seconds)
Status Job ID Name Coverage
  Test
passed #168993
system

00:37:58

passed #168992
test

00:16:37