Merge branch 'hotfix/1.2.1'
fix samples hash
Merge branch 'hotfix/1.2.2' into develop