Merge branch 'document-search' into dev