DIAP-345

Part of DIAP-345