Merge "Fix key alias string comparison" into sc-qpr1-dev