Merge branch 'hotfix/1.2.1'

latest commit 59cb78ae9c
@chadrien authored