DIAP-028

Part of DIAP-028