DIAP-244

Part of DIAP-244