Rackspace rebuild (branch: dev)