DIAP-245

Part of DIAP-245