Merge remote-tracking branch 'origin/development' into development
* Bugfix: Set searchClassId for advanced search