Fix: hotdog
Merge branch 'hotfix/hotdog'
Merge branch 'hotfix/hotdog' into develop
Merge branch 'develop'