DIAP-391

Part of DIAP-391