Additional Bugfix
Merge branch 'feature' into develop
Updated Version 3.1.58.145