Update to be in sync with latest changes
Testing Done:
Issue Number:
Approved by:
Reviewed by: