DIAP-242

Part of DIAP-242