Closes #3475161
Merge request pipeline #286217 passed
#286218
Merge request pipeline passed for bbed6327 11 months ago