Issue #2353351 by Dave Reid: fixed Replace file does not respect original file location or sub directory