DIAP-386

Part of DIAP-386