TMDM-7973: update the safe-check code to only enforce that user input is integer number, update error message accordingly
Merge branch 'maintenance/5.6'