Relates to #3461630. This merge request was automatically created by the Project Update Bot. It contains the changes from run 11-223311.