DIAP-608

Part of DIAP-608