Merge branch 'hotfix/fix-searchlist'
Fix Search delay reset
Merge branch 'hotfix/fix-searchdelay' into develop