Mr address review comments

Merged andreas.fenkart requested to merge taw/dss-mainline:MR_address-review-comments into master May 14, 2021