DIAP-575

Part of DIAP-575