Port changes for enterprise (do not merge)

Seems to be working on staging and pro staging. Needs to be tested on enterprise.