Merge branch 'develop' into adubel/home-page–searc