AWS & Azure Cloud Support Fix by Michael MagdyAWS & Azure Cloud Support Fix by Michael Magdy