DIAP-231

Part of DIAP-231