DIAP-367

Part of DIAP-367