DIAP-050

Part of DIAP-050