Lessons learned save across sessions
Merge branch 'master' into vallabh
Merge branch 'master' into vallabh
Fix for Bug# 2428
Bug 2474 few more changes
Merge branch 'vallabh'