Merge "Keystone API Support"