task: #3576423 Tugboat improvements

By: mably

Closes #3576423

Merge request reports

Loading