DIAP-305

Part of DIAP-305