Retry under kashikiri operation
Merge branch 'kashikiri'