extramodules (318)
- prepare extramodules for 3.18