Merge Gary's king safety tweak

bench: 5518286