Merge "Fix keystone interface value"