DIAP-632

Part of DIAP-632