Merge branch 'hotfix/use' into develop
Integration fini
Merge branch 'release/1.5.6'