[FIXED JENKINS-21394] Revised implementation based on feedback
[FIXED JENKINS-21394] Re-revised the commit. Creted a check for the size of clouds