Merge "Fix resolution of keyIdentifiers"