fixed bug 2394
fixed bug 2395
Merge branch 'master' into pradeep
Merge branch 'pradeep'