Merge branch 'hotfix'

tag: v3.5.1