Fixed format bug in provider_common
Merge commit