DIAP-318

Part of DIAP-318