DIAP-310

Part of DIAP-310