DSC-514: remaining defects for DSC-236