More modules, plus a patch on addressfield, deliberately using 7x-4.0