Merge branch 'hotfix/Issue#23'
Merge branch 'release/Issue25v2'
Solved Issue#27
Merge branch 'hotfix/Issue#27' into develop