DIAP-427

Part of DIAP-427