DIAP-671

Part of DIAP-671