DIAP-637

Part of DIAP-637