Sync with master

bench: 7818446
Set threshold at 100 below alpha

bench: 7026128