WCM-97 apply Miguel's changes to the other big modules