alf updates from master
Merge pull request #7803 from adobe/randy/alf

ALF updates from master