DIAP-538

Part of DIAP-538