Merge branch 'set_text_search_config_timeout' into 'develop'