Merge upstream master branch
Signed-off-by: Bernhard Rosenkränzer bernhard.rosenkraenzer.ext@huawei.com