task #046-Search_setup: Modules added
Merge branch '046-Search_setup' into develop