DIAP-008

Part of DIAP-008