Merging changes for Build 45

- Roopesh