Merge branch 'jk/ewah-use-right-type-in-sizeof'