DIAP-359

Part of DIAP-359