Merge branch 'hotfix/clarify'