& Merge branch 'development' into feature--patient-referral # Conflicts: # lib/client/base_app_client.dart # lib/config/config.dart # lib/config/localized_values.dart # lib/locator.dart # lib/util/translations_delegate_base.dart