Merge branch 'Bug#2882Test'
Solved Bug #2845
Merge branch 'Bug2845' into develop