Merge branch 'release/1.2.1' into develop
blerp
v1.2.2 - hotfix
Merge branch 'release/1.2.2'