DIAP-565

Part of DIAP-565