case 2045 Bugfix.
Merge branch 'case-2045' into develop