CLOUDSTACK-804 bharat's comments