Move to Equinox 3.8.2