[MULTICLOUD] Changes for Jakarta release