Merge Current master into 4259

Issue-Ref: 4259
Issue-Url: #4259


Signed-off-by: Konstantin Blaschke <blaschke@fortiss.org>