synchronise configureScanNumber to prevent skipping numbers
Merge branch '8.36'