CLOUDIFY-1229
refactored