Update the master branch with the changes to the main branch.
approved this merge request
mentioned in commit 7a1c991c
merged