DIAP-417

Part of DIAP-417