DIAP-468

Part of DIAP-468