'BUG:4028'
BUG#4028

fix bug #4028
BUG#4028
Merge pull request #4310 from bewithaman/master

'BUG:4028'