alf changes from master
Merge pull request #8601 from adobe/randy/alf_localization

Alf changes from master