Merge branch 'develop' into 'fix/notifsettings-breaking-login'

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index 31a22bb31f359b8fade88a4a1aaeb3385e518ab4,6e13b38756c14689c87e4e0621e6b4507ea4b3cc..9b0678023f9e83f4168555f94f38b5e87bce598c
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -13,7 -19,8 +19,9 @@@ The format is based on [Keep a Changelo
  ### Fixed
  
  - Try to save exported ConfigDB settings (migrate_from_db) in the system temp directory if default location is not writable.
+ - Uploading custom instance thumbnail via AdminAPI/AdminFE generated invalid URL to the image
+ - Applying ConcurrentLimiter settings via AdminAPI
 +- User login failures if their `notification_settings` were in a NULL state.
  
  ## [2.3.0] - 2020-03-01