Merge branch 'unicode-search' into 'develop'