DIAP-672

Part of DIAP-672