Cleaned up version of closed MR - !271 (closed)
v24b contains a CFV version and v24a contains a full version of the TRD + 2D for main CBM
Depends on: