Fix #2471 merging with defaults