DIAP-491

Part of DIAP-491