Null merge 3.5 (change already applied to default)