Merge with 1.2.9