Merge "release 1.2.6"