DIAP-644

Part of DIAP-644