DIAP-059

Part of DIAP-059