DIAP-578

Part of DIAP-578