DIAP-482

Part of DIAP-482