DIAP-526

Part of DIAP-526