removed old changes because @peterflynn said there would be a new story for Find/Replace in issue #5969
Merge branch 'sean' into changes