ALF updates from PR 7506
Merge pull request #7507 from adobe/randy/ALF-updates-7506

ALF updates for release branch