DIAP-381

Part of DIAP-381