Updated to SCANsat v7 RC2.4