Merger: Minor fix, create_entity should return URI