DIAP-657

Part of DIAP-657