Partially merged from Rackspace branch