Pre-go-live update

Latest changes from staging for go-live.