Merge changes of Andi and Mathis
Pipeline #33538 passed
Pipeline passed for 59ab8e20 on develop Dec 8, 2020
Pipeline #33539 passed
Pipeline passed for 6641ca6d on master Dec 8, 2020
merged
mentioned in commit 6641ca6d