Merge branch 'development' into 'onki-rest-autocomplete'

The autocomplete feature should be written to be eventually merged with
the current (or future) development branch, so bring the feature branch
up to date with main development.

Manual merge due to conflicts.