Merge "Test that the replace flag does not need to be set"