H316: Convert IMP short leaders to long, and vice versa.

H316: Convert IMP short leaders to long, and vice versa. #915