Merge branch 'release/1.2.6' into develop
remove conflict marker
Merge branch 'develop'