DIAP-586

Part of DIAP-586