DIAP-394

Part of DIAP-394