DIAP-248

Part of DIAP-248