Merge branch '505-dev-search-query-performance-fix' into 'dev'

Resolve "On IMT Instance : Error message or crashes when changing the status of terms in large batch"

See merge request !445