Merge branch 'hotfix/hotfix'
Procedure
Merge branch 'hotfix/hotfix' into develop