Solved Bug #2845
Merge branch 'Bug2845'