Merge branch 'release/1.2.2' into develop
Version bump to 1.2.6
Merge branch 'release/1.2.6'