Merge "Make DoCreatePropertyMap use index key" into devel/master