jsridhar updates
Merge jsridhar