Merge the result of the current peer review to r/2.0.x

Description

Pull request ticket for develop branch.

For a list of open Pull Requests see here http://repo.virtuos.uos.de:5001/

Fixed, no review needed
Your pinned fields
Click on the next to a field label to start pinning.

Assignee

Lars Kiesow

Reporter

Rüdiger Rolf