DIAP-352

Part of DIAP-352