DIAP-339

Part of DIAP-339