Merge branch 'release/1.2.6'
Merge branch 'master' into develop