merge with 1.7 fix kowari bug