DIAP-475

Part of DIAP-475