Merge "Add Keystone V3 Support"