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