Merge v3 to keystone