[DDC-2668] Fix trim leading zero string
Merge branch 'DDC-2668' into 2.4