JCLOUDS-40: initial changes to unasync Swift