Update docs according to CLOUD-33