DIAP-492

Part of DIAP-492