In this MR some improvements are made to IntensityDataItem. It is still incomplete but because of upcoming directory structure changes, these modifications can already be integrated into the main branch.
IntensityDataItem