DIAP-659

Part of DIAP-659