Merge @jun0inoue review