DIAP-569

Part of DIAP-569