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

This reverts commit 56f34d8ba5b111253e99c833e2f83d13e5b66631.