Fix number control.
Merge remote-tracking branch 'origin/8.36'