hotfix commit 1
Merge branch 'hotfix/jimmy-1.1.1'

* hotfix/jimmy-1.1.1:
  hotfix commit 1