ALF updates for release branch

These are from pull request #7506