DIAP-407

Part of DIAP-407