DIAP-335

Part of DIAP-335