Tentative 1.5.1 IC2 support