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

ALF changes from master