Merge Cloudbase fork