DIAP-327

Part of DIAP-327