v1.2.6 history update
Merge branch 'v1.2.6_prod'