Complete review feedback from PR #1042

[hohwille]

In PR #1042 several review comments had been set resolved without addressing the comment and doing a change.
To prevent blockage of dependent stories, I simply had to merge before I go on vacation. I could only address 2 more of my review comments.
This story is a reminder that we need to go through the review comments and do the remaining rework.

[hohwille]

I went through all my review comments and the ones not resolved are meanwhile addressed and I could not find anything left to do here. Hence, I am closing this issue.