Added translation for yes/no; added providerRoles;
Merge remote-tracking branch 'origin/master'