HUB-36 #resolve Cloudant workaround