DIAP-609

Part of DIAP-609