FEND-990 recent search changes complete
Merge remote-tracking branch 'origin/dev/fend-990' into release/2.6.3rc