DIAP-060

Part of DIAP-060