DIAP-364

Part of DIAP-364