DIAP-408

Part of DIAP-408