Merge/fixes 1.2.6