DIAP-012

Part of DIAP-012