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