DIAP-452

Part of DIAP-452