DIAP-187

Part of DIAP-187