DIAP-531

Part of DIAP-531