DIAP-469

Part of DIAP-469