merge with Kowari bug fix in 1.7