this closes JCLOUDS-737

cc @adriancole could please review it?