Fix a multi-thread bug caused by parallel dictionary loading
Update canossa
Merge branch 'develop'
Update version