DIAP-559

Part of DIAP-559