DIAP-393

Part of DIAP-393