Refactoring and search core part-implementation.
HOTFIX
Merge remote-tracking branch 'origin/Development' into maaak