Changes suggested in PR for JCLOUDS-224