DIAP-449

Part of DIAP-449