Merge remote-tracking branch 'origin/change_reference_to_place_id'