Changing provider ids to strings.
Merge branch 'master' into on_same_path