Merge branch 'nigiri'