alf changes for release branch

alf changes for release branch