Merge "Fix for Keytsone v3"