DF#QCADOOMES-1869 fix for NumberGenerationService