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