'searching team' working
Merge branch 'searching-team' into nightly