missing 1.6 compatibility changes, added strategies to multimodule