DIAP-662

Part of DIAP-662