Merge "Fixed bug in generation of return type for list key properties."