Preserve vs Overwrite behavior for story #158