Merge "Use separate SemanticKey for keys with null values" into main