Merge @jun0inoue review (cont.)