DIAP-646

Part of DIAP-646