DIAP-247

Part of DIAP-247