fixes #7501 export from search builder
Merge branch 'dev' into test