Sync with master

bench: 4728533
Don't trade down material when in advantage

bench: 4528668