Merge branch 'hotfix/1.5.5'
Adjust logic..
Bump version.
Merge branch 'hotfix/1.5.6' into develop