DIAP-542

Part of DIAP-542