version 1.2.6
Merge branch 'release/1.2.6' into develop