Merge PracticeUpdate Prod changes to be incorporated with foundation 4 work