Solved Bug #2896
Merge branch 'Bug2896' into develop