version update
Merge branch 'release/1.2.6' into develop