Merge branch 'java/zigzag-conversion'