alf changes from master
Merge pull request #7477 from adobe/randy/alf-master-update

ALF master update