Relates to #3586269. This merge request was automatically created by the Project Update Bot. It contains the changes from run 12-839256.