FEND -888 Extra text showing up above the saved search email body
Merge remote-tracking branch 'origin/release/feb_r2' into release/feb_r2