Changes from sf-te

Tested on org staging and enterprise.