Branch 'stokes-devel' - casd