Merge "Use Collection instead of List for entity list" into pi-dev