JCLOUDS-619: Consider Review Feedback.