CLOUD-252 some review item fixed