DIAP-058

Part of DIAP-058