Merge branch 'hotfix-1.2.1'
Merge branch 'develop'
Fixed Clippy
Merge branch 'hotfix-1.3.1' into develop