Merge "Fix key alias string comparison"