Prevent defaults from being merged when unguarded
Update CHANGELOG