Merge #480 search length strategies.