master
Linear: determine grace amount from range (#9719)
Scale: Make sure grace is applied only once (#8913)
