Merge master back into develop-dunfell
In MR !42 (merged) changes were merged into master as part of Release 5.0.0, but these changes were never merged to develop-dunfell. Merge the changes back in order to sync the branches.
Edited by Frieder Schrempf