Replace hardcoded 128 by constant

No functional change.
Merge remote-tracking branch 'upstream/master'