Merge branch 'develop' into 'install-strings'

# Conflicts:
#   server/scripts/update_from_dev_stable.sh