DIAP-315

Part of DIAP-315