Merge branch 'hotfix/Issue#28v2'
Check Issue#34
Merge branch 'hotfix/Issue#34'
Merge tag 'Issue#34' into develop

Solved Isseue#34
Solved Issue#34
Merge branch 'hotfix/Issue#32v2'
Merge tag 'Issue#32v2' into develop

Solved Issue#34