Hotfix: Fix bug
Do not differ between integer and string
Merge branch 'DDBNEXT-1505-BOZ-v2' into develop