DIAP-314

Part of DIAP-314