DIAP-481

Part of DIAP-481