Merging changes from Ravi build.  Will include all changes in release notes