Lps 51239

Please review the last commit for SF change.

If it is ok, please forward it to Brian.

Thanks!