v1.2.6
Merge branch 'release/v1.2.6' into develop