Fix #3586292 : CI issues reported by validation jobs

Closes #3586292

Merge request reports

Loading