DDBNEXT-1490: Search setting should be valid for the session
Merge remote-tracking branch 'origin/DDBNEXT-1490-BOZ' into develop