Update-Synch from local team

Bringing code back to full merge for both teams