Merge branch 'master' into feature/refactor-search-css

Merge branch 'master' into feature/refactor-search-css