Merge branch 'fix/17942_archiveId_search' into 'develop'

Fix/17942 archive id search

See merge request !716
2 jobs for develop in 36 seconds (queued for 9 minutes and 3 seconds)