Base code merged to SPIN 2.4