DIAP-085

Part of DIAP-085