CLOUDIFY-2136 commenting