DIAP-414

Part of DIAP-414